Merge tag 'upstream/2.1.0'
authorGraham Inggs <ginggs@debian.org>
Fri, 7 Jul 2017 15:18:15 +0000 (17:18 +0200)
committerGraham Inggs <ginggs@debian.org>
Fri, 7 Jul 2017 15:18:15 +0000 (17:18 +0200)
Upstream version 2.1.0


Trivial merge